feat(bin): scaffold jj bookmark branch step for jj-managed projects - #1945
Open
swissgrammie wants to merge 5 commits into
Open
feat(bin): scaffold jj bookmark branch step for jj-managed projects#1945swissgrammie wants to merge 5 commits into
swissgrammie wants to merge 5 commits into
Conversation
fm-brief.sh now reads the home registry's `jj` token (after the mode bracket) and, when present, emits `jj bookmark create fm/<id>` as the ship brief's branch step instead of `git checkout -b`. Projects without the token keep the existing git step byte-identically; the scout and secondmate variants are untouched.
swissgrammie
force-pushed
the
fm/brief-jj-support
branch
from
August 22, 2026 00:27
5fbafa0 to
a8d5a28
Compare
Confidence Score: 5/5The PR appears safe to merge. No blocking failure remains. Reviews (4): Last reviewed commit: "fix(bin): make the worker verify jj tool..." | Re-trigger Greptile |
![greptile-apps[bot]](https://avatars.githubusercontent.com/in/867647?s=60&v=4){kind=small}
The scaffold-side PATH check only proves firstmate's environment has jj/jjhouse; the worker runs in a daemon-owned pane that does not inherit that PATH, so a passing scaffold check could still mandate a jj bookmark step the worker cannot run. The generated branch step now makes the worker verify `command -v jj && command -v jjhouse` in its own environment first and report `blocked: jj tooling missing in worker environment` if either is missing, keeping the scaffold-side refusal as a fast-fail. The Greptile review's fallback and bracket-position findings were already addressed on this branch: the no-tooling path refuses with exit 1 instead of falling back to git, and the registry scan only reads the mode bracket at field 3. Tests cover the worker-side gate in the generated brief and the legacy [v2] jj description row.
Author
|
Thanks for the review. I verified each finding against the current branch
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Enables Jujutsu (jj) support in firstmate: ship briefs scaffold the jj bookmark branch step when a project is jj-marked.
Takes effect only when jj has been selected for a project and jjhouse is installed. All other projects (treehouse/git) keep the existing workflow, byte-identical.
The generated jj brief makes the worker verify jj/jjhouse in its own environment before creating the bookmark and reports
blocked: jj tooling missing in worker environmentif either is missing, because the worker pane may not inherit firstmate's PATH. The scaffold itself refuses to emit a jj step when the tooling is absent from the host PATH (a jj-managed project forbids raw git writes, so there is no runnable fallback). The registry scan reads the mode bracket only at field 3, so description text like[v2] jj migrationcan never flip a legacy row to jj-managed.Fixes the Greptile review findings on this PR.